Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Livechat visitor not being prompted for transcript when himself is closing the chat #10767

Merged
merged 9 commits into from
Jun 20, 2018

Conversation

renatobecker-zz
Copy link

Closes #7681

This PR fixes the issue that was happening when a visitor closes the chat. If the setting for sending the transcript by email is enabled, it should prompt the visitor to send a copy of the chat, but this was not occurring on client side, only if the chat was closed by agent.
This was occurring due to a bug on sweet alert 1.x, which was not working well when using swal in sequence. After changing the package to a newer package, using sweet alert 2.x, the bug is no longer happening.

@renatobecker-zz renatobecker-zz added this to the 0.65.0 milestone May 14, 2018
@renatobecker-zz renatobecker-zz added this to Desireable in Livechat via automation May 14, 2018
@renatobecker-zz renatobecker-zz added this to Desirable in May/2018 via automation May 14, 2018
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10767 May 14, 2018 20:41 Inactive
@renatobecker-zz renatobecker-zz moved this from Desirable to Review/QA in May/2018 May 14, 2018
@renatobecker-zz renatobecker-zz moved this from Desireable to Review/QA in Livechat May 17, 2018
Copy link
Member

@sampaiodiego sampaiodiego left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the sweetalert update broke the department switch. the swal confirmation is not shown, it stays behind the switch department modal.

also, if changing the sweetalert package, why not use the npm version instead of a meteor package?

@sampaiodiego sampaiodiego modified the milestones: 0.65.0, 0.66.0 May 20, 2018
@sampaiodiego sampaiodiego added this to Desireable in June/2018 via automation May 20, 2018
@sampaiodiego sampaiodiego removed this from Review/QA in May/2018 May 20, 2018
@renatobecker-zz
Copy link
Author

@sampaiodiego, thanks for you feedback!
I will check the issue you related(department switch).
About the sweetalert package, as I said before, in sometimes I've just kept the same pattern I found in codebase, but I'll change this as well, using npm.

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10767 May 21, 2018 17:46 Inactive
@renatobecker-zz
Copy link
Author

Fix swal confirmation that was being displayed behind the department switch form.
Meteor swal package removed, start using npm version.

@rodrigok rodrigok moved this from Desireable to Review/QA in June/2018 May 21, 2018
@sampaiodiego sampaiodiego temporarily deployed to rocket-chat-pr-10767 June 18, 2018 12:46 Inactive
@sampaiodiego sampaiodiego self-assigned this Jun 18, 2018
@@ -804,6 +804,10 @@ input:focus {
border-top-left-radius: inherit;
}

.swal2-container {
z-index: 10000 !important;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of changing the third party CSS I would rather change our own..

the largest z-index we have is 200. so it would be better changing modal's z-index instead of sweetalert's

if ((typeof response === 'boolean') && !response) {
confirmButtonText: t('yes')
}).then((result) => {
if ((typeof result.value === 'boolean') && !response) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since there are a lot of changes here, what do you think on improving it's logic to look more "flat" (as the previous code improvements) ?

@sampaiodiego sampaiodiego moved this from Review/QA to In progress in June/2018 Jun 18, 2018
# Conflicts:
#	packages/rocketchat-livechat/.app/package.json
…om:RocketChat/Rocket.Chat into livechat-send-transcription-on-client-side

# Conflicts:
#	packages/rocketchat-livechat/.app/package.json
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10767 June 20, 2018 15:07 Inactive
@renatobecker-zz
Copy link
Author

Hi @sampaiodiego!
I just submitted the changes requested in your last review.
Thanks.

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10767 June 20, 2018 15:15 Inactive
@renatobecker-zz renatobecker-zz moved this from In progress to Review/QA in June/2018 Jun 20, 2018
@sampaiodiego sampaiodiego changed the title [FIX] Livechat transcript request on client side [FIX] Livechat visitor not being prompted for transcript when himself is closing the chat Jun 20, 2018
@sampaiodiego sampaiodiego merged commit f9a5812 into develop Jun 20, 2018
June/2018 automation moved this from Review/QA to Closed Jun 20, 2018
@sampaiodiego sampaiodiego deleted the livechat-send-transcription-on-client-side branch June 20, 2018 20:05
@rodrigok rodrigok mentioned this pull request Jun 28, 2018
@renatobecker-zz renatobecker-zz moved this from Review/QA to Closed in Livechat Aug 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Livechat
  
Closed
June/2018
  
Closed
Development

Successfully merging this pull request may close these issues.

Livechat user ends chat doesn't offer to send transcript
5 participants